/ Linux Cubed Series 2: Applications / Linux Cubed Series 2 - Applications.iso / editors / emacs / xemacs / xemacs-1.006 / xemacs-1 / lib / xemacs-19.13 / lisp / packages / diff.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 75 | 65 20 41 75 67 20 32 39 |du on Tu|e Aug 29|
|00000040| 20 31 34 3a 31 32 3a 33 | 33 20 31 39 39 35 0a 3b | 14:12:3|3 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 78 65 |;; from |file /xe|
|00000060| 6d 61 63 73 2f 78 65 6d | 61 63 73 2d 31 39 2e 31 |macs/xem|acs-19.1|
|00000070| 33 2d 72 65 6c 65 61 73 | 65 2f 65 64 69 74 6f 72 |3-releas|e/editor|
|00000080| 2f 6c 69 73 70 2f 70 61 | 63 6b 61 67 65 73 2f 64 |/lisp/pa|ckages/d|
|00000090| 69 66 66 2e 65 6c 0a 3b | 3b 3b 20 65 6d 61 63 73 |iff.el.;|;; emacs|
|000000a0| 20 76 65 72 73 69 6f 6e | 20 31 39 2e 31 33 20 58 | version| 19.13 X|
|000000b0| 45 6d 61 63 73 20 4c 75 | 63 69 64 2e 0a 3b 3b 3b |Emacs Lu|cid..;;;|
|000000c0| 20 62 79 74 65 63 6f 6d | 70 20 76 65 72 73 69 6f | bytecom|p versio|
|000000d0| 6e 20 32 2e 32 35 3b 20 | 31 2d 53 65 70 2d 39 34 |n 2.25; |1-Sep-94|
|000000e0| 2e 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |..;;; op|timizati|
|000000f0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|00000100| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|00000110| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000120| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000130| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000140| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000150| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000160| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000170| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000180| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n)..    |
|00000190| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|000001a0| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|000001b0| 22 29 29 29 0a 20 20 20 | 20 28 65 72 72 6f 72 20 |"))).   | (error |
|000001c0| 22 54 68 69 73 20 66 69 | 6c 65 20 77 61 73 20 63 |"This fi|le was c|
|000001d0| 6f 6d 70 69 6c 65 64 20 | 66 6f 72 20 45 6d 61 63 |ompiled |for Emac|
|000001e0| 73 20 31 39 2e 22 29 29 | 0a 0a 28 72 65 71 75 69 |s 19."))|..(requi|
|000001f0| 72 65 20 27 63 6f 6d 70 | 69 6c 65 29 0a 28 64 65 |re 'comp|ile).(de|
|00000200| 66 76 61 72 20 64 69 66 | 66 2d 73 77 69 74 63 68 |fvar dif|f-switch|
|00000210| 65 73 20 28 70 75 72 65 | 63 6f 70 79 20 22 2d 63 |es (pure|copy "-c|
|00000220| 22 29 20 22 5c 0a 2a 41 | 20 73 74 72 69 6e 67 20 |") "\.*A| string |
|00000230| 6f 72 20 6c 69 73 74 20 | 6f 66 20 73 74 72 69 6e |or list |of strin|
|00000240| 67 73 20 73 70 65 63 69 | 66 79 69 6e 67 20 73 77 |gs speci|fying sw|
|00000250| 69 74 63 68 65 73 20 74 | 6f 20 62 65 20 62 65 20 |itches t|o be be |
|00000260| 70 61 73 73 65 64 20 74 | 6f 20 64 69 66 66 2e 22 |passed t|o diff."|
|00000270| 29 0a 28 64 65 66 76 61 | 72 20 64 69 66 66 2d 72 |).(defva|r diff-r|
|00000280| 65 67 65 78 70 2d 61 6c | 69 73 74 20 27 28 28 22 |egexp-al|ist '(("|
|00000290| 5e 40 40 20 2d 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |^@@ -\\(|[0-9]+\\|
|000002a0| 29 2c 5b 30 2d 39 5d 2b | 20 5c 5c 2b 5c 5c 28 5b |),[0-9]+| \\+\\([|
|000002b0| 30 2d 39 5d 2b 5c 5c 29 | 2c 5b 30 2d 39 5d 2b 20 |0-9]+\\)|,[0-9]+ |
|000002c0| 40 40 24 22 20 31 20 32 | 29 20 28 22 5e 5c 5c 2a |@@$" 1 2|) ("^\\*|
|000002d0| 5c 5c 2a 5c 5c 2a 20 5c | 5c 28 5b 30 2d 39 5d 2b |\\*\\* \|\([0-9]+|
|000002e0| 5c 5c 29 2c 5b 30 2d 39 | 5d 2b 20 5c 5c 2a 5c 5c |\\),[0-9|]+ \\*\\|
|000002f0| 2a 5c 5c 2a 5c 5c 2a 24 | 22 20 31 20 6e 69 6c 29 |*\\*\\*$|" 1 nil)|
|00000300| 20 28 22 5e 2d 2d 2d 20 | 5c 5c 28 5b 30 2d 39 5d | ("^--- |\\([0-9]|
|00000310| 2b 5c 5c 29 2c 5b 30 2d | 39 5d 2b 20 2d 2d 2d 2d |+\\),[0-|9]+ ----|
|00000320| 24 22 20 6e 69 6c 20 31 | 29 20 28 22 5e 5c 5c 28 |$" nil 1|) ("^\\(|
|00000330| 5b 30 2d 39 5d 2b 5c 5c | 29 5c 5c 28 2c 5b 30 2d |[0-9]+\\|)\\(,[0-|
|00000340| 39 5d 2b 5c 5c 29 3f 5b | 61 64 63 5d 5c 5c 28 5b |9]+\\)?[|adc]\\([|
|00000350| 30 2d 39 5d 2b 5c 5c 29 | 5c 5c 28 2c 5b 30 2d 39 |0-9]+\\)|\\(,[0-9|
|00000360| 5d 2b 5c 5c 29 3f 24 22 | 20 31 20 33 29 20 28 22 |]+\\)?$"| 1 3) ("|
|00000370| 5e 5c 5c 28 5b 30 2d 39 | 5d 2b 5c 5c 29 5c 5c 28 |^\\([0-9|]+\\)\\(|
|00000380| 2c 5b 30 2d 39 5d 2b 5c | 5c 29 3f 5b 61 64 63 5d |,[0-9]+\|\)?[adc]|
|00000390| 24 22 20 31 29 20 28 22 | 5e 5b 61 64 63 5d 5c 5c |$" 1) ("|^[adc]\\|
|000003a0| 28 5b 30 2d 39 5d 2b 5c | 5c 29 5c 5c 28 20 5b 30 |([0-9]+\|\)\\( [0|
|000003b0| 2d 39 5d 2b 5c 5c 29 3f | 24 22 20 31 29 29 20 22 |-9]+\\)?|$" 1)) "|
|000003c0| 5c 0a 41 6c 69 73 74 20 | 28 52 45 47 45 58 50 20 |\.Alist |(REGEXP |
|000003d0| 4f 4c 44 2d 49 44 58 20 | 4e 45 57 2d 49 44 58 29 |OLD-IDX |NEW-IDX)|
|000003e0| 20 6f 66 20 72 65 67 75 | 6c 61 72 20 65 78 70 72 | of regu|lar expr|
|000003f0| 65 73 73 69 6f 6e 73 20 | 74 6f 20 6d 61 74 63 68 |essions |to match|
|00000400| 20 64 69 66 66 65 72 65 | 6e 63 65 20 0a 73 65 63 | differe|nce .sec|
|00000410| 74 69 6f 6e 73 20 69 6e | 20 5c 5c 5b 64 69 66 66 |tions in| \\[diff|
|00000420| 5d 20 6f 75 74 70 75 74 | 2e 20 20 49 66 20 52 45 |] output|.  If RE|
|00000430| 47 45 58 50 20 6d 61 74 | 63 68 65 73 2c 20 74 68 |GEXP mat|ches, th|
|00000440| 65 20 4f 4c 44 2d 49 44 | 58 27 74 68 0a 73 75 62 |e OLD-ID|X'th.sub|
|00000450| 65 78 70 72 65 73 73 69 | 6f 6e 20 67 69 76 65 73 |expressi|on gives|
|00000460| 20 74 68 65 20 6c 69 6e | 65 20 6e 75 6d 62 65 72 | the lin|e number|
|00000470| 20 69 6e 20 74 68 65 20 | 6f 6c 64 20 66 69 6c 65 | in the |old file|
|00000480| 2c 20 61 6e 64 20 4e 45 | 57 2d 49 44 58 27 74 68 |, and NE|W-IDX'th|
|00000490| 0a 73 75 62 65 78 70 72 | 65 73 73 69 6f 6e 20 67 |.subexpr|ession g|
|000004a0| 69 76 65 73 20 74 68 65 | 20 6c 69 6e 65 20 6e 75 |ives the| line nu|
|000004b0| 6d 62 65 72 20 69 6e 20 | 74 68 65 20 6e 65 77 20 |mber in |the new |
|000004c0| 66 69 6c 65 2e 20 20 49 | 66 20 4f 4c 44 2d 49 44 |file.  I|f OLD-ID|
|000004d0| 58 20 6f 72 20 4e 45 57 | 2d 49 44 58 0a 69 73 20 |X or NEW|-IDX.is |
|000004e0| 6e 69 6c 2c 20 52 45 47 | 45 58 50 20 6d 61 74 63 |nil, REG|EXP matc|
|000004f0| 68 65 73 20 6f 6e 6c 79 | 20 68 61 6c 66 20 61 20 |hes only| half a |
|00000500| 73 65 63 74 69 6f 6e 2e | 22 29 0a 28 64 65 66 76 |section.|").(defv|
|00000510| 61 72 20 64 69 66 66 2d | 6f 6c 64 2d 66 69 6c 65 |ar diff-|old-file|
|00000520| 20 6e 69 6c 20 22 5c 0a | 54 68 69 73 20 69 73 20 | nil "\.|This is |
|00000530| 74 68 65 20 6f 6c 64 20 | 66 69 6c 65 20 6e 61 6d |the old |file nam|
|00000540| 65 20 69 6e 20 74 68 65 | 20 63 6f 6d 70 61 72 69 |e in the| compari|
|00000550| 73 6f 6e 20 69 6e 20 74 | 68 69 73 20 62 75 66 66 |son in t|his buff|
|00000560| 65 72 2e 22 29 0a 28 64 | 65 66 76 61 72 20 64 69 |er.").(d|efvar di|
|00000570| 66 66 2d 6e 65 77 2d 66 | 69 6c 65 20 6e 69 6c 20 |ff-new-f|ile nil |
|00000580| 22 5c 0a 54 68 69 73 20 | 69 73 20 74 68 65 20 6e |"\.This |is the n|
|00000590| 65 77 20 66 69 6c 65 20 | 6e 61 6d 65 20 69 6e 20 |ew file |name in |
|000005a0| 74 68 65 20 63 6f 6d 70 | 61 72 69 73 6f 6e 20 69 |the comp|arison i|
|000005b0| 6e 20 74 68 69 73 20 62 | 75 66 66 65 72 2e 22 29 |n this b|uffer.")|
|000005c0| 0a 28 64 65 66 76 61 72 | 20 64 69 66 66 2d 6f 6c |.(defvar| diff-ol|
|000005d0| 64 2d 74 65 6d 70 2d 66 | 69 6c 65 20 6e 69 6c 20 |d-temp-f|ile nil |
|000005e0| 22 5c 0a 54 68 69 73 20 | 69 73 20 74 68 65 20 6e |"\.This |is the n|
|000005f0| 61 6d 65 20 6f 66 20 61 | 20 74 65 6d 70 20 66 69 |ame of a| temp fi|
|00000600| 6c 65 20 74 6f 20 62 65 | 20 64 65 6c 65 74 65 64 |le to be| deleted|
|00000610| 20 61 66 74 65 72 20 64 | 69 66 66 20 66 69 6e 69 | after d|iff fini|
|00000620| 73 68 65 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |shes.").|(defvar |
|00000630| 64 69 66 66 2d 6e 65 77 | 2d 74 65 6d 70 2d 66 69 |diff-new|-temp-fi|
|00000640| 6c 65 20 6e 69 6c 20 22 | 5c 0a 54 68 69 73 20 69 |le nil "|\.This i|
|00000650| 73 20 74 68 65 20 6e 61 | 6d 65 20 6f 66 20 61 20 |s the na|me of a |
|00000660| 74 65 6d 70 20 66 69 6c | 65 20 74 6f 20 62 65 20 |temp fil|e to be |
|00000670| 64 65 6c 65 74 65 64 20 | 61 66 74 65 72 20 64 69 |deleted |after di|
|00000680| 66 66 20 66 69 6e 69 73 | 68 65 73 2e 22 29 0a 28 |ff finis|hes.").(|
|00000690| 66 73 65 74 20 27 64 69 | 66 66 2d 70 61 72 73 65 |fset 'di|ff-parse|
|000006a0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 23 5b 28 |-differe|nces #[(|
|000006b0| 6c 69 6d 69 74 2d 73 65 | 61 72 63 68 20 66 69 6e |limit-se|arch fin|
|000006c0| 64 2d 61 74 2d 6c 65 61 | 73 74 29 20 22 c0 11 c2 |d-at-lea|st) "...|
|000006d0| c3 21 88 0c ab 83 0c 62 | 88 c5 c6 0e 07 c8 23 c9 |.!.....b|......#.|
|000006e0| 1e 5c 6e cb cc 0e 07 5c | 22 29 cd c0 ce c0 1e 0f |.\n....\|")......|
|000006f0| 1e 10 1e 11 1e 12 1e 13 | 1e 14 0e 11 ac e2 d5 0e |........|........|
|00000700| 14 c0 d6 23 ab da 0e 13 | 89 16 0f ab 8f 0e 0f 40 |...#....|.......@|
|00000710| 40 94 ac 88 0e 0f 41 89 | 16 0f ac 71 0e 0f 40 89 |@.....A.|...q..@.|
|00000720| 16 0f 41 40 ab 8a 0e 12 | 0e 17 0e 0f 41 40 5c 22 |..A@....|....A@\"|
|00000730| 88 d8 0e 0f 38 ab 8a 0e | 12 0e 19 d8 0e 0f 38 5c |....8...|......8\|
|00000740| 22 88 0e 10 54 16 10 0e | 1a ab 87 0e 10 0e 1a 59 |"...T...|.......Y|
|00000750| ac 8a 0e 1b ab 26 60 0e | 1b 59 ab 20 d6 89 16 11 |.....&`.|.Y. ....|
|00000760| ab 1e 0e 11 ab 84 60 14 | aa 82 64 14 c2 dc 21 88 |......`.|..d...!.|
|00000770| 2e 06 09 9f 89 11 87 22 | 20 5b 6e 69 6c 20 63 6f |......."| [nil co|
|00000780| 6d 70 69 6c 61 74 69 6f | 6e 2d 65 72 72 6f 72 2d |mpilatio|n-error-|
|00000790| 6c 69 73 74 20 6d 65 73 | 73 61 67 65 20 22 50 61 |list mes|sage "Pa|
|000007a0| 72 73 69 6e 67 20 64 69 | 66 66 65 72 65 6e 63 65 |rsing di|fference|
|000007b0| 73 2e 2e 2e 22 20 63 6f | 6d 70 69 6c 61 74 69 6f |s..." co|mpilatio|
|000007c0| 6e 2d 70 61 72 73 69 6e | 67 2d 65 6e 64 20 6d 61 |n-parsin|g-end ma|
|000007d0| 70 63 6f 6e 63 61 74 20 | 23 5b 28 65 6c 74 29 20 |pconcat |#[(elt) |
|000007e0| 22 c0 09 40 c2 51 87 22 | 20 5b 22 5c 5c 28 22 20 |"..@.Q."| ["\\(" |
|000007f0| 65 6c 74 20 22 5c 5c 29 | 22 5d 20 33 5d 20 64 69 |elt "\\)|"] 3] di|
|00000800| 66 66 2d 72 65 67 65 78 | 70 2d 61 6c 69 73 74 20 |ff-regex|p-alist |
|00000810| 22 5c 5c 7c 22 20 31 20 | 73 75 62 65 78 70 72 20 |"\\|" 1 |subexpr |
|00000820| 6d 61 70 63 61 72 20 23 | 5b 28 65 6c 74 29 20 22 |mapcar #|[(elt) "|
|00000830| 08 c1 c2 0b 41 5c 22 42 | 08 c4 0b 40 21 c5 5c 5c |....A\"B|...@!.\\|
|00000840| 5c 5c 10 87 22 20 5b 73 | 75 62 65 78 70 72 20 6d |\\.." [s|ubexpr m|
|00000850| 61 70 63 61 72 20 23 5b | 28 6e 29 20 22 08 ad 83 |apcar #[|(n) "...|
|00000860| 09 08 5c 5c 87 22 20 5b | 6e 20 73 75 62 65 78 70 |..\\." [|n subexp|
|00000870| 72 5d 20 32 5d 20 65 6c | 74 20 63 6f 75 6e 74 2d |r] 2] el|t count-|
|00000880| 72 65 67 65 78 70 2d 67 | 72 6f 75 70 69 6e 67 73 |regexp-g|roupings|
|00000890| 20 31 5d 20 34 5d 20 23 | 5b 28 66 69 6c 65 20 73 | 1] 4] #|[(file s|
|000008a0| 75 62 65 78 70 72 29 20 | 22 8a 08 94 62 88 c1 79 |ubexpr) |"...b..y|
|000008b0| 88 c2 20 29 c3 08 94 08 | 95 7b 21 1c 8a c5 20 1e |.. )....|.{!... .|
|000008c0| 06 c7 8e c8 0e 09 21 71 | 88 2a 8a ca 0c 21 88 c2 |......!q|.*...!..|
|000008d0| 20 2b 42 0e 0b 42 89 16 | 0b 87 22 20 5b 73 75 62 | +B..B..|.." [sub|
|000008e0| 65 78 70 72 20 30 20 70 | 6f 69 6e 74 2d 6d 61 72 |expr 0 p|oint-mar|
|000008f0| 6b 65 72 20 73 74 72 69 | 6e 67 2d 74 6f 2d 69 6e |ker stri|ng-to-in|
|00000900| 74 20 6c 69 6e 65 20 6d | 61 74 63 68 2d 64 61 74 |t line m|atch-dat|
|00000910| 61 20 5f 6d 61 74 63 68 | 5f 64 61 74 61 5f 20 28 |a _match|_data_ (|
|00000920| 28 73 74 6f 72 65 2d 6d | 61 74 63 68 2d 64 61 74 |(store-m|atch-dat|
|00000930| 61 20 5f 6d 61 74 63 68 | 5f 64 61 74 61 5f 29 29 |a _match|_data_))|
|00000940| 20 66 69 6e 64 2d 66 69 | 6c 65 2d 6e 6f 73 65 6c | find-fi|le-nosel|
|00000950| 65 63 74 20 66 69 6c 65 | 20 67 6f 74 6f 2d 6c 69 |ect file| goto-li|
|00000960| 6e 65 20 63 6f 6d 70 69 | 6c 61 74 69 6f 6e 2d 65 |ne compi|lation-e|
|00000970| 72 72 6f 72 2d 6c 69 73 | 74 5d 20 34 5d 20 30 20 |rror-lis|t] 4] 0 |
|00000980| 67 20 6e 75 6d 2d 6c 6f | 63 69 2d 66 6f 75 6e 64 |g num-lo|ci-found|
|00000990| 20 66 6f 75 6e 64 2d 64 | 65 73 69 72 65 64 20 6e | found-d|esired n|
|000009a0| 65 77 2d 65 72 72 6f 72 | 20 67 72 6f 75 70 73 20 |ew-error| groups |
|000009b0| 72 65 67 65 78 70 20 72 | 65 2d 73 65 61 72 63 68 |regexp r|e-search|
|000009c0| 2d 66 6f 72 77 61 72 64 | 20 74 20 64 69 66 66 2d |-forward| t diff-|
|000009d0| 6f 6c 64 2d 66 69 6c 65 | 20 32 20 64 69 66 66 2d |old-file| 2 diff-|
|000009e0| 6e 65 77 2d 66 69 6c 65 | 20 66 69 6e 64 2d 61 74 |new-file| find-at|
|000009f0| 2d 6c 65 61 73 74 20 6c | 69 6d 69 74 2d 73 65 61 |-least l|imit-sea|
|00000a00| 72 63 68 20 22 50 61 72 | 73 69 6e 67 20 64 69 66 |rch "Par|sing dif|
|00000a10| 66 65 72 65 6e 63 65 73 | 2e 2e 2e 64 6f 6e 65 22 |ferences|...done"|
|00000a20| 5d 20 37 5d 29 0a 28 66 | 73 65 74 20 27 64 69 66 |] 7]).(f|set 'dif|
|00000a30| 66 20 23 5b 28 6f 6c 64 | 20 6e 65 77 20 26 6f 70 |f #[(old| new &op|
|00000a40| 74 69 6f 6e 61 6c 20 73 | 77 69 74 63 68 65 73 29 |tional s|witches)|
|00000a50| 20 22 c0 09 21 11 c0 5c | 6e 21 12 c3 5c 6e 21 ab | "..!..\|n!..\n!.|
|00000a60| 90 c3 09 21 ac 99 c0 c4 | 09 21 c5 5c 6e 21 5c 22 |...!....|.!.\n!\"|
|00000a70| 12 aa 8e c3 09 21 ab 89 | c0 c4 5c 6e 21 c5 09 21 |.....!..|..\n!..!|
|00000a80| 5c 22 11 c6 5c 6e 21 c6 | 09 21 c7 1e 08 1e 09 1e |\"..\n!.|.!......|
|00000a90| 5c 6e c7 8e cb cc cd ce | 0e 0f ab 8e 0e 0f 3a ab |\n......|......:.|
|00000aa0| 84 0e 0f aa 91 0e 0f 43 | aa 8c 0e 10 3a ab 84 0e |.......C|....:...|
|00000ab0| 10 aa 83 0e 10 43 0e 5c | 6e ac 84 0e 09 ad 85 d1 |.....C.\|n.......|
|00000ac0| 5c 6e d1 09 46 d2 0e 5c | 6e ae 81 5c 6e 21 43 d2 |\n..F..\|n..\n!C.|
|00000ad0| 0e 09 ae 81 09 21 43 25 | d3 23 1e 14 d5 0e 14 d6 |.....!C%|.#......|
|00000ae0| d7 d8 24 16 08 d9 0e 08 | 21 88 da db 21 5c 6e 4c |..$.....|!...!\nL|
|00000af0| 88 da dc 21 09 4c 88 da | dd 21 0e 5c 6e 4c 88 da |...!.L..|.!.\nL..|
|00000b00| de 21 0e 09 4c 88 da df | 21 e0 4c 88 0e 08 2d 87 |.!..L...|!.L...-.|
|00000b10| 22 20 5b 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |" [expan|d-file-n|
|00000b20| 61 6d 65 20 6e 65 77 20 | 6f 6c 64 20 66 69 6c 65 |ame new |old file|
|00000b30| 2d 64 69 72 65 63 74 6f | 72 79 2d 70 20 66 69 6c |-directo|ry-p fil|
|00000b40| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00000b50| 6f 72 79 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 61 73 |ory file|-name-as|
|00000b60| 2d 64 69 72 65 63 74 6f | 72 79 20 66 69 6c 65 2d |-directo|ry file-|
|00000b70| 6c 6f 63 61 6c 2d 63 6f | 70 79 20 6e 69 6c 20 62 |local-co|py nil b|
|00000b80| 75 66 20 6e 65 77 2d 61 | 6c 74 20 6f 6c 64 2d 61 |uf new-a|lt old-a|
|00000b90| 6c 74 20 6d 61 70 63 6f | 6e 63 61 74 20 69 64 65 |lt mapco|ncat ide|
|00000ba0| 6e 74 69 74 79 20 61 70 | 70 65 6e 64 20 28 22 64 |ntity ap|pend ("d|
|00000bb0| 69 66 66 22 29 20 73 77 | 69 74 63 68 65 73 20 64 |iff") sw|itches d|
|00000bc0| 69 66 66 2d 73 77 69 74 | 63 68 65 73 20 22 2d 4c |iff-swit|ches "-L|
|00000bd0| 22 20 73 68 65 6c 6c 2d | 71 75 6f 74 65 2d 61 72 |" shell-|quote-ar|
|00000be0| 67 75 6d 65 6e 74 20 22 | 20 22 20 63 6f 6d 6d 61 |gument "| " comma|
|00000bf0| 6e 64 20 63 6f 6d 70 69 | 6c 65 2d 69 6e 74 65 72 |nd compi|le-inter|
|00000c00| 6e 61 6c 20 22 4e 6f 20 | 6d 6f 72 65 20 64 69 66 |nal "No |more dif|
|00000c10| 66 65 72 65 6e 63 65 73 | 22 20 22 44 69 66 66 22 |ferences|" "Diff"|
|00000c20| 20 64 69 66 66 2d 70 61 | 72 73 65 2d 64 69 66 66 | diff-pa|rse-diff|
|00000c30| 65 72 65 6e 63 65 73 20 | 70 6f 70 2d 74 6f 2d 62 |erences |pop-to-b|
|00000c40| 75 66 66 65 72 20 6d 61 | 6b 65 2d 6c 6f 63 61 6c |uffer ma|ke-local|
|00000c50| 2d 76 61 72 69 61 62 6c | 65 20 64 69 66 66 2d 6f |-variabl|e diff-o|
|00000c60| 6c 64 2d 66 69 6c 65 20 | 64 69 66 66 2d 6e 65 77 |ld-file |diff-new|
|00000c70| 2d 66 69 6c 65 20 64 69 | 66 66 2d 6f 6c 64 2d 74 |-file di|ff-old-t|
|00000c80| 65 6d 70 2d 66 69 6c 65 | 20 64 69 66 66 2d 6e 65 |emp-file| diff-ne|
|00000c90| 77 2d 74 65 6d 70 2d 66 | 69 6c 65 20 63 6f 6d 70 |w-temp-f|ile comp|
|00000ca0| 69 6c 61 74 69 6f 6e 2d | 66 69 6e 69 73 68 2d 66 |ilation-|finish-f|
|00000cb0| 75 6e 63 74 69 6f 6e 20 | 23 5b 28 62 75 66 66 20 |unction |#[(buff |
|00000cc0| 6d 73 67 29 20 22 08 ab | 84 c1 08 21 88 5c 6e ad |msg) "..|...!.\n.|
|00000cd0| 83 c1 5c 6e 21 87 22 20 | 5b 64 69 66 66 2d 6f 6c |..\n!." |[diff-ol|
|00000ce0| 64 2d 74 65 6d 70 2d 66 | 69 6c 65 20 64 65 6c 65 |d-temp-f|ile dele|
|00000cf0| 74 65 2d 66 69 6c 65 20 | 64 69 66 66 2d 6e 65 77 |te-file |diff-new|
|00000d00| 2d 74 65 6d 70 2d 66 69 | 6c 65 5d 20 32 5d 5d 20 |-temp-fi|le] 2]] |
|00000d10| 39 20 22 5c 0a 46 69 6e | 64 20 61 6e 64 20 64 69 |9 "\.Fin|d and di|
|00000d20| 73 70 6c 61 79 20 74 68 | 65 20 64 69 66 66 65 72 |splay th|e differ|
|00000d30| 65 6e 63 65 73 20 62 65 | 74 77 65 65 6e 20 4f 4c |ences be|tween OL|
|00000d40| 44 20 61 6e 64 20 4e 45 | 57 20 66 69 6c 65 73 2e |D and NE|W files.|
|00000d50| 0a 49 6e 74 65 72 61 63 | 74 69 76 65 6c 79 20 74 |.Interac|tively t|
|00000d60| 68 65 20 63 75 72 72 65 | 6e 74 20 62 75 66 66 65 |he curre|nt buffe|
|00000d70| 72 27 73 20 66 69 6c 65 | 20 6e 61 6d 65 20 69 73 |r's file| name is|
|00000d80| 20 74 68 65 20 64 65 66 | 61 75 6c 74 20 66 6f 72 | the def|ault for|
|00000d90| 20 4e 45 57 0a 61 6e 64 | 20 61 20 62 61 63 6b 75 | NEW.and| a backu|
|00000da0| 70 20 66 69 6c 65 20 66 | 6f 72 20 4e 45 57 20 69 |p file f|or NEW i|
|00000db0| 73 20 74 68 65 20 64 65 | 66 61 75 6c 74 20 66 6f |s the de|fault fo|
|00000dc0| 72 20 4f 4c 44 2e 0a 57 | 69 74 68 20 70 72 65 66 |r OLD..W|ith pref|
|00000dd0| 69 78 20 61 72 67 2c 20 | 70 72 6f 6d 70 74 20 66 |ix arg, |prompt f|
|00000de0| 6f 72 20 64 69 66 66 20 | 73 77 69 74 63 68 65 73 |or diff |switches|
|00000df0| 2e 22 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |." (byte|-code ".|
|00000e00| 89 19 1a c3 20 89 11 ab | 92 c4 09 21 ab 8d c5 c6 |.... ...|...!....|
|00000e10| c7 09 21 c8 51 c0 09 c9 | 24 aa 86 c5 ca c0 89 c9 |..!.Q...|$.......|
|00000e20| 24 89 11 cb 09 21 89 12 | ab 94 c4 5c 6e 21 ab 8f |$....!..|...\n!..|
|00000e30| c5 cc c7 5c 6e 21 c8 51 | cd 5c 6e 21 5c 6e c9 24 |...\n!.Q|.\n!\n.$|
|00000e40| aa 88 c5 ce cd 09 21 c0 | c9 24 89 12 44 9f 2a 0e |......!.|.$..D.*.|
|00000e50| 0f ad 93 d0 d1 0e 12 3b | ab 84 0e 12 aa 86 d3 d4 |.......;|........|
|00000e60| 0e 12 d5 23 5c 22 43 a4 | 87 22 20 5b 6e 69 6c 20 |...#\"C.|." [nil |
|00000e70| 6e 65 77 66 20 6f 6c 64 | 66 20 62 75 66 66 65 72 |newf old|f buffer|
|00000e80| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 66 69 6c 65 2d |-file-na|me file-|
|00000e90| 65 78 69 73 74 73 2d 70 | 20 72 65 61 64 2d 66 69 |exists-p| read-fi|
|00000ea0| 6c 65 2d 6e 61 6d 65 20 | 22 44 69 66 66 20 6e 65 |le-name |"Diff ne|
|00000eb0| 77 20 66 69 6c 65 3a 20 | 28 22 20 66 69 6c 65 2d |w file: |(" file-|
|00000ec0| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00000ed0| 79 20 22 29 20 22 20 74 | 20 22 44 69 66 66 20 6e |y ") " t| "Diff n|
|00000ee0| 65 77 20 66 69 6c 65 3a | 20 22 20 66 69 6c 65 2d |ew file:| " file-|
|00000ef0| 6e 65 77 65 73 74 2d 62 | 61 63 6b 75 70 20 22 44 |newest-b|ackup "D|
|00000f00| 69 66 66 20 6f 72 69 67 | 69 6e 61 6c 20 66 69 6c |iff orig|inal fil|
|00000f10| 65 3a 20 28 22 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |e: (" fi|le-name-|
|00000f20| 64 69 72 65 63 74 6f 72 | 79 20 22 44 69 66 66 20 |director|y "Diff |
|00000f30| 6f 72 69 67 69 6e 61 6c | 20 66 69 6c 65 3a 20 22 |original| file: "|
|00000f40| 20 63 75 72 72 65 6e 74 | 2d 70 72 65 66 69 78 2d | current|-prefix-|
|00000f50| 61 72 67 20 72 65 61 64 | 2d 73 74 72 69 6e 67 20 |arg read|-string |
|00000f60| 22 44 69 66 66 20 73 77 | 69 74 63 68 65 73 3a 20 |"Diff sw|itches: |
|00000f70| 22 20 64 69 66 66 2d 73 | 77 69 74 63 68 65 73 20 |" diff-s|witches |
|00000f80| 6d 61 70 63 6f 6e 63 61 | 74 20 69 64 65 6e 74 69 |mapconca|t identi|
|00000f90| 74 79 20 22 20 22 5d 20 | 38 29 5d 29 0a 28 66 73 |ty " "] |8)]).(fs|
|00000fa0| 65 74 20 27 64 69 66 66 | 2d 62 61 63 6b 75 70 20 |et 'diff|-backup |
|00000fb0| 23 5b 28 66 69 6c 65 20 | 26 6f 70 74 69 6f 6e 61 |#[(file |&optiona|
|00000fc0| 6c 20 73 77 69 74 63 68 | 65 73 29 20 22 c0 89 19 |l switch|es) "...|
|00000fd0| 1a c3 0c 21 ab 88 0c 12 | c5 0c 21 11 aa 8c c6 0c |...!....|..!.....|
|00000fe0| 21 ae 84 c7 c8 0c 5c 22 | 12 0c 11 c9 5c 6e 09 0e |!.....\"|....\n..|
|00000ff0| 5c 6e 23 2a 87 22 20 5b | 6e 69 6c 20 6f 72 69 20 |\n#*." [|nil ori |
|00001000| 62 61 6b 20 62 61 63 6b | 75 70 2d 66 69 6c 65 2d |bak back|up-file-|
|00001010| 6e 61 6d 65 2d 70 20 66 | 69 6c 65 20 66 69 6c 65 |name-p f|ile file|
|00001020| 2d 6e 61 6d 65 2d 73 61 | 6e 73 2d 76 65 72 73 69 |-name-sa|ns-versi|
|00001030| 6f 6e 73 20 64 69 66 66 | 2d 6c 61 74 65 73 74 2d |ons diff|-latest-|
|00001040| 62 61 63 6b 75 70 2d 66 | 69 6c 65 20 65 72 72 6f |backup-f|ile erro|
|00001050| 72 20 22 4e 6f 20 62 61 | 63 6b 75 70 20 66 6f 75 |r "No ba|ckup fou|
|00001060| 6e 64 20 66 6f 72 20 25 | 73 22 20 64 69 66 66 20 |nd for %|s" diff |
|00001070| 73 77 69 74 63 68 65 73 | 5d 20 34 20 22 5c 0a 44 |switches|] 4 "\.D|
|00001080| 69 66 66 20 74 68 69 73 | 20 66 69 6c 65 20 77 69 |iff this| file wi|
|00001090| 74 68 20 69 74 73 20 62 | 61 63 6b 75 70 20 66 69 |th its b|ackup fi|
|000010a0| 6c 65 20 6f 72 20 76 69 | 63 65 20 76 65 72 73 61 |le or vi|ce versa|
|000010b0| 2e 0a 55 73 65 73 20 74 | 68 65 20 6c 61 74 65 73 |..Uses t|he lates|
|000010c0| 74 20 62 61 63 6b 75 70 | 2c 20 69 66 20 74 68 65 |t backup|, if the|
|000010d0| 72 65 20 61 72 65 20 73 | 65 76 65 72 61 6c 20 6e |re are s|everal n|
|000010e0| 75 6d 65 72 69 63 61 6c | 20 62 61 63 6b 75 70 73 |umerical| backups|
|000010f0| 2e 0a 49 66 20 74 68 69 | 73 20 66 69 6c 65 20 69 |..If thi|s file i|
|00001100| 73 20 61 20 62 61 63 6b | 75 70 2c 20 64 69 66 66 |s a back|up, diff|
|00001110| 20 69 74 20 77 69 74 68 | 20 69 74 73 20 6f 72 69 | it with| its ori|
|00001120| 67 69 6e 61 6c 2e 0a 54 | 68 65 20 62 61 63 6b 75 |ginal..T|he backu|
|00001130| 70 20 66 69 6c 65 20 69 | 73 20 74 68 65 20 66 69 |p file i|s the fi|
|00001140| 72 73 74 20 66 69 6c 65 | 20 67 69 76 65 6e 20 74 |rst file| given t|
|00001150| 6f 20 60 64 69 66 66 27 | 2e 22 20 28 62 79 74 65 |o `diff'|." (byte|
|00001160| 2d 63 6f 64 65 20 22 c0 | c1 21 5c 6e ad 8f c3 c4 |-code ".|.!\n....|
|00001170| 0d 3b ab 83 0d aa 85 c6 | c7 0d c8 23 5c 22 44 87 |.;......|...#\"D.|
|00001180| 22 20 5b 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |" [read-|file-nam|
|00001190| 65 20 22 44 69 66 66 20 | 28 66 69 6c 65 20 77 69 |e "Diff |(file wi|
|000011a0| 74 68 20 62 61 63 6b 75 | 70 29 3a 20 22 20 63 75 |th backu|p): " cu|
|000011b0| 72 72 65 6e 74 2d 70 72 | 65 66 69 78 2d 61 72 67 |rrent-pr|efix-arg|
|000011c0| 20 72 65 61 64 2d 73 74 | 72 69 6e 67 20 22 44 69 | read-st|ring "Di|
|000011d0| 66 66 20 73 77 69 74 63 | 68 65 73 3a 20 22 20 64 |ff switc|hes: " d|
|000011e0| 69 66 66 2d 73 77 69 74 | 63 68 65 73 20 6d 61 70 |iff-swit|ches map|
|000011f0| 63 6f 6e 63 61 74 20 69 | 64 65 6e 74 69 74 79 20 |concat i|dentity |
|00001200| 22 20 22 5d 20 37 29 5d | 29 0a 28 66 73 65 74 20 |" "] 7)]|).(fset |
|00001210| 27 64 69 66 66 2d 6c 61 | 74 65 73 74 2d 62 61 63 |'diff-la|test-bac|
|00001220| 6b 75 70 2d 66 69 6c 65 | 20 23 5b 28 66 6e 29 20 |kup-file| #[(fn) |
|00001230| 22 c0 09 c2 5c 22 89 1b | ab 86 0b c2 09 5c 22 aa |"...\"..|.....\".|
|00001240| be c4 c5 09 21 21 11 c6 | 09 21 1e 07 c8 0e 07 21 |....!!..|.!.....!|
|00001250| ad 82 0e 07 29 ae a8 c9 | 09 21 40 1e 5c 6e cb 0e |....)...|.!@.\n..|
|00001260| 5c 6e 21 1e 0c cd ce 0e | 5c 6e 21 21 cf 50 89 1e |\n!.....|\n!!.P..|
|00001270| 10 47 1e 11 0e 0c d2 d3 | 0e 10 0e 0c 5c 22 d4 5c |.G......|....\".\|
|00001280| 22 40 50 2c 29 87 22 20 | 5b 66 69 6e 64 2d 66 69 |"@P,)." |[find-fi|
|00001290| 6c 65 2d 6e 61 6d 65 2d | 68 61 6e 64 6c 65 72 20 |le-name-|handler |
|000012a0| 66 6e 20 64 69 66 66 2d | 6c 61 74 65 73 74 2d 62 |fn diff-|latest-b|
|000012b0| 61 63 6b 75 70 2d 66 69 | 6c 65 20 68 61 6e 64 6c |ackup-fi|le handl|
|000012c0| 65 72 20 66 69 6c 65 2d | 63 68 61 73 65 2d 6c 69 |er file-|chase-li|
|000012d0| 6e 6b 73 20 65 78 70 61 | 6e 64 2d 66 69 6c 65 2d |nks expa|nd-file-|
|000012e0| 6e 61 6d 65 20 6d 61 6b | 65 2d 62 61 63 6b 75 70 |name mak|e-backup|
|000012f0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 62 61 6b 20 66 |-file-na|me bak f|
|00001300| 69 6c 65 2d 65 78 69 73 | 74 73 2d 70 20 66 69 6e |ile-exis|ts-p fin|
|00001310| 64 2d 62 61 63 6b 75 70 | 2d 66 69 6c 65 2d 6e 61 |d-backup|-file-na|
|00001320| 6d 65 20 62 61 63 6b 75 | 70 6e 61 6d 65 20 66 69 |me backu|pname fi|
|00001330| 6c 65 2d 6e 61 6d 65 2d | 64 69 72 65 63 74 6f 72 |le-name-|director|
|00001340| 79 20 64 69 72 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |y dir fi|le-name-|
|00001350| 73 61 6e 73 2d 76 65 72 | 73 69 6f 6e 73 20 66 69 |sans-ver|sions fi|
|00001360| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00001370| 74 6f 72 79 20 22 2e 7e | 22 20 62 61 73 65 2d 76 |tory ".~|" base-v|
|00001380| 65 72 73 69 6f 6e 73 20 | 62 76 2d 6c 65 6e 67 74 |ersions |bv-lengt|
|00001390| 68 20 73 6f 72 74 20 66 | 69 6c 65 2d 6e 61 6d 65 |h sort f|ile-name|
|000013a0| 2d 61 6c 6c 2d 63 6f 6d | 70 6c 65 74 69 6f 6e 73 |-all-com|pletions|
|000013b0| 20 23 5b 28 66 6e 31 20 | 66 6e 32 29 20 22 c0 09 | #[(fn1 |fn2) "..|
|000013c0| 21 c0 5c 6e 21 56 87 22 | 20 5b 62 61 63 6b 75 70 |!.\n!V."| [backup|
|000013d0| 2d 65 78 74 72 61 63 74 | 2d 76 65 72 73 69 6f 6e |-extract|-version|
|000013e0| 20 66 6e 31 20 66 6e 32 | 5d 20 33 5d 5d 20 36 20 | fn1 fn2|] 3]] 6 |
|000013f0| 22 5c 0a 52 65 74 75 72 | 6e 20 74 68 65 20 6c 61 |"\.Retur|n the la|
|00001400| 74 65 73 74 20 65 78 69 | 73 74 69 6e 67 20 62 61 |test exi|sting ba|
|00001410| 63 6b 75 70 20 6f 66 20 | 46 49 4c 45 2c 20 6f 72 |ckup of |FILE, or|
|00001420| 20 6e 69 6c 2e 22 5d 29 | 0a 28 70 72 6f 76 69 64 | nil."])|.(provid|
|00001430| 65 20 27 64 69 66 66 29 | 0a                      |e 'diff)|.       |
+--------+-------------------------+-------------------------+--------+--------+